Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minilcm diff API #1181

Merged
merged 43 commits into from
Nov 14, 2024
Merged

Minilcm diff API #1181

merged 43 commits into from
Nov 14, 2024

Conversation

hahn-kev
Copy link
Collaborator

@hahn-kev hahn-kev commented Oct 30, 2024 •
edited
Loading

related to #1127

  • uses the new harmony version to put a commit id on each object
  • creates a new UpdateEntry(Entry entry) api for updating using the version to ensure we don't stomp on changes
  • write some fuzzing tests using randomly generated entries for create and update tests

hahn-kev and others added 25 commits October 17, 2024 14:54
@hahn-kev
refactor diff code out of the sync service
63a7a80
@hahn-kev
change terminiology
f39073f 
was current/previous now before after
@hahn-kev
write test trying to sync changes between an entrys components
99a8524
@hahn-kev
implement Component API
0a01487
@hahn-kev
implement semantic domain API
33eb096
@gitbutler-client
GitButler WIP Commit
c111134
@hahn-kev
Merge branch 'develop' into Prep-diff-apis
5947210 
# Conflicts:
#	backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateSenseProxy.cs
#	backend/FwLite/FwLiteProjectSync.Tests/UpdateDiffTests.cs
#	backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
#	backend/FwLite/MiniLcm/Models/Entry.cs
@hahn-kev
being making API to update an entry by simply passing it in
a411b00
@hahn-kev
add logging from MiniLcmApiFixture to xunit
e03f1e7
@hahn-kev
comment out version stuff and make a 2 entry update api for now
f889baa
@hahn-kev
Merge branch 'develop' into Prep-diff-apis
a4fb38c 
# Conflicts:
#	.idea/.idea.LexBox/.idea/dataSources.xml
#	backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs
@hahn-kev
remove version from entry
804c8fa
@hahn-kev
fix some test bugs related to complex forms getting deleted and then …
2ccf0e2 
…recreated with the same Id
@hahn-kev
use locking to prevent a race condition from calling Project loader i…
f2c3eac 
…nit twice
@hahn-kev
support syncing Entry.ComplexForms in addition to Components
6228935
@hahn-kev
define AddComplexFormType and RemoveComplexFormType on MiniLcmApi
80fb4c3
@hahn-kev
preseed complex form types in crdt projects
90c44b4
@hahn-kev
implement syncing entry complex form types
be5fa9e
@hahn-kev
make complex form type a record
9d4611e
@hahn-kev
test creating an entry with a generated entry
f783ca1
@hahn-kev
write sync tests for a generated entry, fix bugs
f04794e
@hahn-kev
update harmony to include the new BeforeSaveObject option
fb05ae7
@hahn-kev
add version to miniLcm models using CrdtConfig.BeforeSaveObject
2a4e139
@hahn-kev
fix bug trying to use Commit.DateTime in a query
2c4119d
@hahn-kev
implement UpdateEntry(Entry entry) on FwDataMiniLcmApi, then fix bugs
8d7f5a6
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 30, 2024 •
edited
Loading

C# Unit Tests

75 tests  ±0   75 ✅ ±0   5s ⏱️ ±0s
13 suites ±0    0 💤 ±0 
 1 files   ±0    0 ❌ ±0 

Results for commit 9a315be. ± Comparison against base commit 85f9555.

♻️ This comment has been updated with latest results.

myieye
myieye reviewed Oct 30, 2024
View reviewed changes
Copy link
Contributor

@myieye myieye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made a bit of progress

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs Outdated Show resolved Hide resolved
backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs Outdated Show resolved Hide resolved
backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateSenseProxy.cs Outdated Show resolved Hide resolved
backend/FwLite/FwLiteProjectSync.Tests/EntrySyncTests.cs Show resolved Hide resolved
backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs Outdated Show resolved Hide resolved
backend/FwLite/MiniLcm/SyncHelpers/EntrySync.cs Outdated Show resolved Hide resolved
backend/FwLite/MiniLcm/SyncHelpers/EntrySync.cs Outdated Show resolved Hide resolved
backend/FwLite/MiniLcm/SyncHelpers/SenseSync.cs Outdated Show resolved Hide resolved
backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs Outdated Show resolved Hide resolved
backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs Outdated Show resolved Hide resolved
@hahn-kev
Copy link
Collaborator Author

hahn-kev commented Nov 4, 2024

had a chat with Tim, and we realized this approach won't work using version numbers and such, otherwise since updates could come from before that version was made, we can't reliably get that version, if we didn't then we could overwrite someone elses changes.

This was referenced Nov 5, 2024
Merged
Closed
@hahn-kev hahn-kev marked this pull request as draft November 6, 2024 07:24
@hahn-kev
Merge branch 'develop' into minilcm-diff-apis
96c14b7 
# Conflicts:
#	backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
#	backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs
#	backend/FwLite/FwLiteProjectSync.Tests/UpdateDiffTests.cs
#	backend/FwLite/FwLiteProjectSync/CrdtFwdataProjectSyncService.cs
#	backend/FwLite/FwLiteProjectSync/DryRunMiniLcmApi.cs
#	backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
#	backend/FwLite/LcmCrdt/LcmCrdtKernel.cs
#	backend/FwLite/MiniLcm/IMiniLcmWriteApi.cs
#	backend/FwLite/MiniLcm/InMemoryApi.cs
#	backend/FwLite/MiniLcm/SyncHelpers/EntrySync.cs
@hahn-kev
remove version property
bb428cb
@hahn-kev
fix test issue due to parts of speech and domains not being created w…
c8e042f 
…hen an entry is created, fix issue with ordering of adding complex forms to an entry
@hahn-kev
Merge branch 'refs/heads/develop' into minilcm-diff-apis
a4b97c6
@hahn-kev
exclude Semantic domain predefined due to it always being true in fwdata
9a315be
@hahn-kev hahn-kev marked this pull request as ready for review November 12, 2024 02:57
@hahn-kev hahn-kev requested a review from myieye November 12, 2024 02:57
myieye
myieye approved these changes Nov 13, 2024
View reviewed changes
Copy link
Contributor

@myieye myieye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me.
The commit removing object versions was a bit sad to look at 😢

backend/FwLite/MiniLcm.Tests/AutoFakerHelpers/EntryFakerHelper.cs Show resolved Hide resolved
backend/FwLite/MiniLcm.Tests/AutoFakerHelpers/ObjectWithIdOverride.cs Show resolved Hide resolved
backend/FwLite/MiniLcm.Tests/AutoFakerHelpers/EntryFakerHelper.cs Outdated Show resolved Hide resolved
@hahn-kev hahn-kev merged commit b188a5d into develop Nov 14, 2024
16 checks passed
@hahn-kev hahn-kev deleted the minilcm-diff-apis branch November 14, 2024 02:13
@myieye myieye mentioned this pull request Nov 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@myieye myieye myieye approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hahn-kev @myieye @gitbutler-client